modelpk vs. model_id
1 mainītis faili ar 13 papildinājumiem un 3 dzēšanām
+ 13
- 3
integral/models.py
@@ -66,19 +66,29 @@ class SaleclerkIntegralIncomeExpensesInfo(BaseModelMixin): |
||
| 66 | 66 |
@property |
| 67 | 67 |
def consumer_impression(self): |
| 68 | 68 |
try: |
| 69 |
- impression = ConsumeImpressionInfo.objects.get(clerk_id=self.clerk_id, model_id=self.clerk_id, brand_id=self.brand_id, serialNo=self.code) |
|
| 69 |
+ impression = ConsumeImpressionInfo.objects.get(clerk_id=self.clerk_id, brand_id=self.brand_id, model_id=self.clerk_id, serialNo=self.code) |
|
| 70 | 70 |
except ConsumeImpressionInfo.DoesNotExist: |
| 71 | 71 |
impression = None |
| 72 | 72 |
return impression.data if impression else {}
|
| 73 | 73 |
|
| 74 | 74 |
@property |
| 75 | 75 |
def data(self): |
| 76 |
+ try: |
|
| 77 |
+ model = ModelInfo.objects.get(model_id=self.model_id).fulldata |
|
| 78 |
+ except ModelInfo.DoesNotExist: |
|
| 79 |
+ model = {}
|
|
| 80 |
+ |
|
| 81 |
+ try: |
|
| 82 |
+ impression = ConsumeImpressionInfo.objects.get(clerk_id=self.clerk_id, brand_id=self.brand_id, model_id=model.pk, serialNo=self.code) |
|
| 83 |
+ except ConsumeImpressionInfo.DoesNotExist: |
|
| 84 |
+ impression = None |
|
| 85 |
+ |
|
| 76 | 86 |
return {
|
| 77 | 87 |
'type': self.type, |
| 78 | 88 |
'integral': self.integral, |
| 79 |
- 'model_info': self.model_info, |
|
| 89 |
+ 'model_info': self.model.fulldata if model else {},
|
|
| 80 | 90 |
'modelName': self.model_name, |
| 81 |
- 'consumer_impression': self.consumer_impression, |
|
| 91 |
+ 'consumer_impression': impression.data if impression else {},
|
|
| 82 | 92 |
'serialNo': self.code, |
| 83 | 93 |
'created_at': self.created_at, |
| 84 | 94 |
} |